union checkout: Fix symlink handling for xattrs
authorAlexander Larsson <alexl@redhat.com>
Fri, 5 Dec 2014 12:46:58 +0000 (13:46 +0100)
committerAlexander Larsson <alexl@redhat.com>
Fri, 5 Dec 2014 14:53:42 +0000 (15:53 +0100)
Applying xattrs on a symlink during checkout failed since
it was setting the xattrs on the final filename, not the
temporary name.

This made the "checkout union 1" test in test-basic.sh
fail.

https://bugzilla.gnome.org/show_bug.cgi?id=741125

src/libostree/ostree-repo-checkout.c

index 29243d51c36ccab70568b448cf6635a3901d7ef9..531fdf9e6b3f6bebe3ead5e4b3bb0a6b49581d10 100644 (file)
@@ -271,7 +271,7 @@ checkout_file_unioning_from_input_at (OstreeRepoCheckoutMode mode,
           
       if (xattrs)
         {
-          if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, destination_name,
+          if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, temp_filename,
                                                xattrs, cancellable, error))
             goto out;
         }